Skip to content

Commit 34c5e71

Browse files
Merge pull request #18138 from bparees/import
Automatic merge from submit-queue. refresh quickstarts from external locations
2 parents 9059896 + d933a61 commit 34c5e71

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

examples/quickstarts/cakephp-mysql-persistent.json

+2
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
"readinessProbe": {
210210
"timeoutSeconds": 3,
211211
"initialDelaySeconds": 3,
212+
"periodSeconds": 60,
212213
"httpGet": {
213214
"path": "/health.php",
214215
"port": 8080
@@ -217,6 +218,7 @@
217218
"livenessProbe": {
218219
"timeoutSeconds": 3,
219220
"initialDelaySeconds": 30,
221+
"periodSeconds": 60,
220222
"httpGet": {
221223
"path": "/health.php",
222224
"port": 8080

examples/quickstarts/cakephp-mysql.json

+2
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
"readinessProbe": {
210210
"timeoutSeconds": 3,
211211
"initialDelaySeconds": 3,
212+
"periodSeconds": 60,
212213
"httpGet": {
213214
"path": "/health.php",
214215
"port": 8080
@@ -217,6 +218,7 @@
217218
"livenessProbe": {
218219
"timeoutSeconds": 3,
219220
"initialDelaySeconds": 30,
221+
"periodSeconds": 60,
220222
"httpGet": {
221223
"path": "/health.php",
222224
"port": 8080

examples/quickstarts/nginx.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"description": "An example Nginx HTTP server and a reverse proxy (nginx) application that serves static content. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nginx-ex/blob/master/README.md.",
99
"tags": "quickstart,nginx",
1010
"iconClass": "icon-nginx",
11-
"template.openshift.io/long-description": "This template defines resources needed to develop a static application served by Nginx HTTP server and a reverse proxy (nginx), including a build configuration and application deployment configuration.",
12-
"template.openshift.io/provider-display-name": "Red Hat, Inc.",
13-
"template.openshift.io/documentation-url": "https://github.com/sclorg/nginx-ex",
14-
"template.openshift.io/support-url": "https://access.redhat.com"
11+
"openshift.io/long-description": "This template defines resources needed to develop a static application served by Nginx HTTP server and a reverse proxy (nginx), including a build configuration and application deployment configuration.",
12+
"openshift.io/provider-display-name": "Red Hat, Inc.",
13+
"openshift.io/documentation-url": "https://github.com/sclorg/nginx-ex",
14+
"openshift.io/support-url": "https://access.redhat.com"
1515
}
1616
},
1717
"message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nginx-ex/blob/master/README.md.",

pkg/oc/bootstrap/bindata.go

+8-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/testdata/bindata.go

+10-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)