Skip to content

Commit 9d12ad6

Browse files
pvalenapvalena
committed
Add image-streams and update db-templates.
Add new image-streams for centos7 and rhel7. - source: https://github.com/sclorg/image-streams Update db-templates/* to new version of corresponding container image. Add nginx to quickstarts/* and run `hack/update-external-examples.sh`. Update bindata. Add and fix tests. nginx -> docker.io/library/wordpress change: #17922 (comment)
1 parent 9425ace commit 9d12ad6

24 files changed

+2181
-282
lines changed

‎examples/db-templates/mariadb-ephemeral-template.json

+11-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
"name": "mariadb-ephemeral",
66
"annotations": {
77
"openshift.io/display-name": "MariaDB (Ephemeral)",
8-
"description": "MariaDB database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
8+
"description": "MariaDB database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
99
"iconClass": "icon-mariadb",
1010
"tags": "database,mariadb",
1111
"openshift.io/long-description": "This template provides a standalone MariaDB server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.",
1212
"openshift.io/provider-display-name": "Red Hat, Inc.",
13-
"openshift.io/documentation-url": "https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md",
13+
"openshift.io/documentation-url": "https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md",
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md.",
1818
"labels": {
1919
"template": "mariadb-persistent-template"
2020
},
@@ -82,7 +82,7 @@
8282
],
8383
"from": {
8484
"kind": "ImageStreamTag",
85-
"name": "mariadb:10.1",
85+
"name": "mariadb:${MARIADB_VERSION}",
8686
"namespace": "${NAMESPACE}"
8787
}
8888
}
@@ -242,6 +242,13 @@
242242
"description": "Name of the MariaDB database accessed.",
243243
"value": "sampledb",
244244
"required": true
245+
},
246+
{
247+
"name": "MARIADB_VERSION",
248+
"displayName": "Version of MariaDB Image",
249+
"description": "Version of MariaDB image to be used (10.0, 10.1, 10.2 or latest).",
250+
"value": "10.2",
251+
"required": true
245252
}
246253
]
247254
}

‎examples/db-templates/mariadb-persistent-template.json

+11-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
"name": "mariadb-persistent",
66
"annotations": {
77
"openshift.io/display-name": "MariaDB",
8-
"description": "MariaDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
8+
"description": "MariaDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
99
"iconClass": "icon-mariadb",
1010
"tags": "database,mariadb",
1111
"openshift.io/long-description": "This template provides a standalone MariaDB server with a database created. The database is stored on persistent storage. The database name, username, and password are chosen via parameters when provisioning this service.",
1212
"openshift.io/provider-display-name": "Red Hat, Inc.",
13-
"openshift.io/documentation-url": "https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md",
13+
"openshift.io/documentation-url": "https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md",
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md.",
1818
"labels": {
1919
"template": "mariadb-persistent-template"
2020
},
@@ -99,7 +99,7 @@
9999
],
100100
"from": {
101101
"kind": "ImageStreamTag",
102-
"name": "mariadb:10.1",
102+
"name": "mariadb:${MARIADB_VERSION}",
103103
"namespace": "${NAMESPACE}"
104104
}
105105
}
@@ -260,6 +260,13 @@
260260
"value": "sampledb",
261261
"required": true
262262
},
263+
{
264+
"name": "MARIADB_VERSION",
265+
"displayName": "Version of MariaDB Image",
266+
"description": "Version of MariaDB image to be used (10.0, 10.1, 10.2 or latest).",
267+
"value": "10.2",
268+
"required": true
269+
},
263270
{
264271
"name": "VOLUME_CAPACITY",
265272
"displayName": "Volume Capacity",

‎examples/db-templates/mysql-ephemeral-template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "mysql-ephemeral",
66
"annotations": {
77
"openshift.io/display-name": "MySQL (Ephemeral)",
8-
"description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
8+
"description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
99
"iconClass": "icon-mysql-database",
1010
"tags": "database,mysql",
1111
"openshift.io/long-description": "This template provides a standalone MySQL server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.",
@@ -14,7 +14,7 @@
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.",
1818
"labels": {
1919
"template": "mysql-ephemeral-template"
2020
},

‎examples/db-templates/mysql-persistent-template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "mysql-persistent",
66
"annotations": {
77
"openshift.io/display-name": "MySQL",
8-
"description": "MySQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
8+
"description": "MySQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
99
"iconClass": "icon-mysql-database",
1010
"tags": "database,mysql",
1111
"openshift.io/long-description": "This template provides a standalone MySQL server with a database created. The database is stored on persistent storage. The database name, username, and password are chosen via parameters when provisioning this service.",
@@ -14,7 +14,7 @@
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.",
1818
"labels": {
1919
"template": "mysql-persistent-template"
2020
},

‎examples/db-templates/postgresql-ephemeral-template.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "postgresql-ephemeral",
66
"annotations": {
77
"openshift.io/display-name": "PostgreSQL (Ephemeral)",
8-
"description": "PostgreSQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
8+
"description": "PostgreSQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
99
"iconClass": "icon-postgresql",
1010
"tags": "database,postgresql",
1111
"openshift.io/long-description": "This template provides a standalone PostgreSQL server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.",
@@ -14,7 +14,7 @@
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${POSTGRESQL_USER}\n Password: ${POSTGRESQL_PASSWORD}\n Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${POSTGRESQL_USER}\n Password: ${POSTGRESQL_PASSWORD}\n Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.",
1818
"labels": {
1919
"template": "postgresql-ephemeral-template"
2020
},
@@ -127,11 +127,11 @@
127127
}
128128
},
129129
"livenessProbe": {
130+
"exec": {
131+
"command": [ "/bin/sh", "-i", "-c", "pg_isready -h 127.0.0.1 -p 5432" ]
132+
},
130133
"timeoutSeconds": 1,
131-
"initialDelaySeconds": 30,
132-
"tcpSocket": {
133-
"port": 5432
134-
}
134+
"initialDelaySeconds": 30
135135
},
136136
"env": [
137137
{
@@ -245,8 +245,8 @@
245245
{
246246
"name": "POSTGRESQL_VERSION",
247247
"displayName": "Version of PostgreSQL Image",
248-
"description": "Version of PostgreSQL image to be used (9.2, 9.4, 9.5 or latest).",
249-
"value": "9.5",
248+
"description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
249+
"value": "9.6",
250250
"required": true
251251
}
252252
]

‎examples/db-templates/postgresql-persistent-template.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "postgresql-persistent",
66
"annotations": {
77
"openshift.io/display-name": "PostgreSQL",
8-
"description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
8+
"description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
99
"iconClass": "icon-postgresql",
1010
"tags": "database,postgresql",
1111
"openshift.io/long-description": "This template provides a standalone PostgreSQL server with a database created. The database is stored on persistent storage. The database name, username, and password are chosen via parameters when provisioning this service.",
@@ -14,7 +14,7 @@
1414
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
17-
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${POSTGRESQL_USER}\n Password: ${POSTGRESQL_PASSWORD}\n Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
17+
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${POSTGRESQL_USER}\n Password: ${POSTGRESQL_PASSWORD}\n Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.",
1818
"labels": {
1919
"template": "postgresql-persistent-template"
2020
},
@@ -144,11 +144,11 @@
144144
}
145145
},
146146
"livenessProbe": {
147+
"exec": {
148+
"command": [ "/bin/sh", "-i", "-c", "pg_isready -h 127.0.0.1 -p 5432" ]
149+
},
147150
"timeoutSeconds": 1,
148-
"initialDelaySeconds": 30,
149-
"tcpSocket": {
150-
"port": 5432
151-
}
151+
"initialDelaySeconds": 30
152152
},
153153
"env": [
154154
{
@@ -269,8 +269,8 @@
269269
{
270270
"name": "POSTGRESQL_VERSION",
271271
"displayName": "Version of PostgreSQL Image",
272-
"description": "Version of PostgreSQL image to be used (9.2, 9.4, 9.5 or latest).",
273-
"value": "9.5",
272+
"description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
273+
"value": "9.6",
274274
"required": true
275275
}
276276
]

0 commit comments

Comments
 (0)