Skip to content

Commit b8c40ed

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #582 from metlos/periodic-okd-sync
SO-142: Periodic sync of OKD samples
2 parents 872bc8c + 30601d2 commit b8c40ed

File tree

7 files changed

+27
-31
lines changed

7 files changed

+27
-31
lines changed

‎assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
{
353353
"name": "JAVA_FIPS_OPTIONS",
354354
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
355-
"description": "See https://access.redhat.com/documentation/en-us/openjdk/11/html-single/configuring_openjdk_11_on_rhel_with_fips/index#config-fips-in-openjdk for the available command line properties to facilitate the JVM running on FIPS nodes.",
355+
"description": "See https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/17/html-single/configuring_red_hat_build_of_openjdk_17_on_rhel_with_fips/index#fips_settings for the available command line properties to facilitate the JVM running on FIPS nodes.",
356356
"value": "-Dcom.redhat.fips=false"
357357
},
358358
{

‎assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
{
321321
"name": "JAVA_FIPS_OPTIONS",
322322
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
323-
"description": "See https://access.redhat.com/documentation/en-us/openjdk/11/html-single/configuring_openjdk_11_on_rhel_with_fips/index#config-fips-in-openjdk for the available command line properties to facilitate the JVM running on FIPS nodes.",
323+
"description": "See https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/17/html-single/configuring_red_hat_build_of_openjdk_17_on_rhel_with_fips/index#fips_settings for the available command line properties to facilitate the JVM running on FIPS nodes.",
324324
"value": "-Dcom.redhat.fips=false"
325325
},
326326
{

‎assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
{
381381
"name": "JAVA_FIPS_OPTIONS",
382382
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
383-
"description": "See https://access.redhat.com/documentation/en-us/openjdk/11/html-single/configuring_openjdk_11_on_rhel_with_fips/index#config-fips-in-openjdk for the available command line properties to facilitate the JVM running on FIPS nodes.",
383+
"description": "See https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/17/html-single/configuring_red_hat_build_of_openjdk_17_on_rhel_with_fips/index#fips_settings for the available command line properties to facilitate the JVM running on FIPS nodes.",
384384
"value": "-Dcom.redhat.fips=false"
385385
},
386386
{

‎assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
{
349349
"name": "JAVA_FIPS_OPTIONS",
350350
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
351-
"description": "See https://access.redhat.com/documentation/en-us/openjdk/11/html-single/configuring_openjdk_11_on_rhel_with_fips/index#config-fips-in-openjdk for the available command line properties to facilitate the JVM running on FIPS nodes.",
351+
"description": "See https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/17/html-single/configuring_red_hat_build_of_openjdk_17_on_rhel_with_fips/index#fips_settings for the available command line properties to facilitate the JVM running on FIPS nodes.",
352352
"value": "-Dcom.redhat.fips=false"
353353
},
354354
{

‎assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
},
1515
"tags": [
1616
{
17-
"name": "24.0.0.9-java8",
17+
"name": "24.0.0.11-java8",
1818
"annotations": {
1919
"description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.",
2020
"iconClass": "icon-openliberty",
21-
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 8",
21+
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 8",
2222
"openshift.io/provider-display-name": "IBM",
2323
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
2424
"supports": "jee,java",
2525
"tags": "builder,openliberty,java"
2626
},
2727
"from": {
2828
"kind": "DockerImage",
29-
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java8"
29+
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java8"
3030
},
3131
"generation": null,
3232
"importPolicy": {},
@@ -35,19 +35,19 @@
3535
}
3636
},
3737
{
38-
"name": "24.0.0.9-java11",
38+
"name": "24.0.0.11-java11",
3939
"annotations": {
4040
"description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.",
4141
"iconClass": "icon-openliberty",
42-
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 11",
42+
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 11",
4343
"openshift.io/provider-display-name": "IBM",
4444
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
4545
"supports": "jee,java",
4646
"tags": "builder,openliberty,java"
4747
},
4848
"from": {
4949
"kind": "DockerImage",
50-
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java11"
50+
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java11"
5151
},
5252
"generation": null,
5353
"importPolicy": {},
@@ -56,19 +56,19 @@
5656
}
5757
},
5858
{
59-
"name": "24.0.0.9-java17",
59+
"name": "24.0.0.11-java17",
6060
"annotations": {
6161
"description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.",
6262
"iconClass": "icon-openliberty",
63-
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 17",
63+
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 17",
6464
"openshift.io/provider-display-name": "IBM",
6565
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
6666
"supports": "jee,java",
6767
"tags": "builder,openliberty,java"
6868
},
6969
"from": {
7070
"kind": "DockerImage",
71-
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java17"
71+
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java17"
7272
},
7373
"generation": null,
7474
"importPolicy": {},
@@ -77,19 +77,19 @@
7777
}
7878
},
7979
{
80-
"name": "24.0.0.9-java21",
80+
"name": "24.0.0.11-java21",
8181
"annotations": {
8282
"description": "Build and run Open Liberty applications on Red Hat Universal Base Image 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/OpenLiberty/open-liberty-s2i/blob/main/README.md.",
8383
"iconClass": "icon-openliberty",
84-
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 21",
84+
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 21",
8585
"openshift.io/provider-display-name": "IBM",
8686
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
8787
"supports": "jee,java",
8888
"tags": "builder,openliberty,java"
8989
},
9090
"from": {
9191
"kind": "DockerImage",
92-
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java21"
92+
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java21"
9393
},
9494
"generation": null,
9595
"importPolicy": {},

‎assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
"metadata": {
404404
"annotations": {
405405
"description": "Defines how to deploy the database",
406-
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"openshift\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
406+
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
407407
"template.alpha.openshift.io/wait-for-ready": "true"
408408
},
409409
"name": "${DATABASE_SERVICE_NAME}"
@@ -663,4 +663,4 @@
663663
"app": "rails-pgsql-persistent",
664664
"template": "rails-pgsql-persistent"
665665
}
666-
}
666+
}

‎assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,6 @@
155155
}
156156
},
157157
"strategy": {
158-
"recreateParams": {
159-
"pre": {
160-
"execNewPod": {
161-
"command": [
162-
"./migrate-database.sh"
163-
],
164-
"containerName": "${NAME}"
165-
},
166-
"failurePolicy": "Abort"
167-
}
168-
},
169158
"type": "Recreate"
170159
},
171160
"template": {
@@ -391,7 +380,7 @@
391380
"metadata": {
392381
"annotations": {
393382
"description": "Defines how to deploy the database",
394-
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\", \"namespace\": \"openshift\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
383+
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
395384
"template.alpha.openshift.io/wait-for-ready": "true"
396385
},
397386
"name": "${DATABASE_SERVICE_NAME}"
@@ -520,6 +509,13 @@
520509
"value": "3.1-ubi8",
521510
"required": true
522511
},
512+
{
513+
"name": "POSTGRESQL_VERSION",
514+
"displayName": "Postgresql Version",
515+
"description": "Version of Postgresql image to be used (12-el8 by default).",
516+
"value": "12-el8",
517+
"required": true
518+
},
523519
{
524520
"name": "MEMORY_LIMIT",
525521
"displayName": "Memory Limit",
@@ -635,4 +631,4 @@
635631
"app": "rails-postgresql-example",
636632
"template": "rails-postgresql-example"
637633
}
638-
}
634+
}

0 commit comments

Comments
 (0)