Skip to content

Commit c7e8dd2

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18970 from coreydaley/update_external_examples
Automatic merge from submit-queue. Updating external examples Updating the external examples Needed for pull request #18708
2 parents ca80207 + 2db75ae commit c7e8dd2

File tree

8 files changed

+102
-102
lines changed

8 files changed

+102
-102
lines changed

‎examples/image-streams/image-streams-centos7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
},
150150
"from": {
151151
"kind": "DockerImage",
152-
"name": "docker.io/openshift/jenkins-2-centos7:v3.9"
152+
"name": "docker.io/openshift/jenkins-2-centos7:v3.10"
153153
},
154154
"name": "2"
155155
}

‎examples/image-streams/image-streams-rhel7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
},
101101
"from": {
102102
"kind": "DockerImage",
103-
"name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.9"
103+
"name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.10"
104104
},
105105
"name": "2"
106106
}

‎examples/quickstarts/django-postgresql-persistent.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,14 @@
358358
],
359359
"image": " ",
360360
"livenessProbe": {
361-
"initialDelaySeconds": 30,
362-
"tcpSocket": {
363-
"port": 5432
361+
"exec": {
362+
"command": [
363+
"/usr/libexec/check-container",
364+
"--live"
365+
]
364366
},
365-
"timeoutSeconds": 1
367+
"initialDelaySeconds": 120,
368+
"timeoutSeconds": 10
366369
},
367370
"name": "postgresql",
368371
"ports": [
@@ -373,10 +376,7 @@
373376
"readinessProbe": {
374377
"exec": {
375378
"command": [
376-
"/bin/sh",
377-
"-i",
378-
"-c",
379-
"psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"
379+
"/usr/libexec/check-container"
380380
]
381381
},
382382
"initialDelaySeconds": 5,

‎examples/quickstarts/django-postgresql.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,14 @@
341341
],
342342
"image": " ",
343343
"livenessProbe": {
344-
"initialDelaySeconds": 30,
345-
"tcpSocket": {
346-
"port": 5432
344+
"exec": {
345+
"command": [
346+
"/usr/libexec/check-container",
347+
"--live"
348+
]
347349
},
348-
"timeoutSeconds": 1
350+
"initialDelaySeconds": 120,
351+
"timeoutSeconds": 10
349352
},
350353
"name": "postgresql",
351354
"ports": [
@@ -356,10 +359,7 @@
356359
"readinessProbe": {
357360
"exec": {
358361
"command": [
359-
"/bin/sh",
360-
"-i",
361-
"-c",
362-
"psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"
362+
"/usr/libexec/check-container"
363363
]
364364
},
365365
"initialDelaySeconds": 5,

‎examples/quickstarts/rails-postgresql-persistent.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,14 @@
405405
],
406406
"image": " ",
407407
"livenessProbe": {
408-
"initialDelaySeconds": 30,
409-
"tcpSocket": {
410-
"port": 5432
408+
"exec": {
409+
"command": [
410+
"/usr/libexec/check-container",
411+
"--live"
412+
]
411413
},
412-
"timeoutSeconds": 1
414+
"initialDelaySeconds": 120,
415+
"timeoutSeconds": 10
413416
},
414417
"name": "postgresql",
415418
"ports": [
@@ -420,10 +423,7 @@
420423
"readinessProbe": {
421424
"exec": {
422425
"command": [
423-
"/bin/sh",
424-
"-i",
425-
"-c",
426-
"psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"
426+
"/usr/libexec/check-container"
427427
]
428428
},
429429
"initialDelaySeconds": 5,

‎examples/quickstarts/rails-postgresql.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -388,11 +388,14 @@
388388
],
389389
"image": " ",
390390
"livenessProbe": {
391-
"initialDelaySeconds": 30,
392-
"tcpSocket": {
393-
"port": 5432
391+
"exec": {
392+
"command": [
393+
"/usr/libexec/check-container",
394+
"--live"
395+
]
394396
},
395-
"timeoutSeconds": 1
397+
"initialDelaySeconds": 120,
398+
"timeoutSeconds": 10
396399
},
397400
"name": "postgresql",
398401
"ports": [
@@ -403,10 +406,7 @@
403406
"readinessProbe": {
404407
"exec": {
405408
"command": [
406-
"/bin/sh",
407-
"-i",
408-
"-c",
409-
"psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"
409+
"/usr/libexec/check-container"
410410
]
411411
},
412412
"initialDelaySeconds": 5,

‎pkg/oc/bootstrap/bindata.go

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)