Skip to content

SO-142: Periodic sync of OKD samples #582

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

Merged
merged 1 commit into from
Nov 19, 2024
Merged

SO-142: Periodic sync of OKD samples #582

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
{
"name": "JAVA_FIPS_OPTIONS",
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
"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.",
"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.",
"value": "-Dcom.redhat.fips=false"
},
{
Expand Down
2 changes: 1 addition & 1 deletion assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
{
"name": "JAVA_FIPS_OPTIONS",
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
"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.",
"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.",
"value": "-Dcom.redhat.fips=false"
},
{
Expand Down
2 changes: 1 addition & 1 deletion assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
{
"name": "JAVA_FIPS_OPTIONS",
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
"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.",
"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.",
"value": "-Dcom.redhat.fips=false"
},
{
Expand Down
2 changes: 1 addition & 1 deletion assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
{
"name": "JAVA_FIPS_OPTIONS",
"displayName": "Allows control over how the JVM interacts with FIPS on startup.",
"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.",
"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.",
"value": "-Dcom.redhat.fips=false"
},
{
Expand Down
24 changes: 12 additions & 12 deletions assets/operator/okd-x86_64/openliberty/imagestreams/openliberty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
},
"tags": [
{
"name": "24.0.0.9-java8",
"name": "24.0.0.11-java8",
"annotations": {
"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.",
"iconClass": "icon-openliberty",
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 8",
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 8",
"openshift.io/provider-display-name": "IBM",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "jee,java",
"tags": "builder,openliberty,java"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java8"
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java8"
},
"generation": null,
"importPolicy": {},
Expand All @@ -35,19 +35,19 @@
}
},
{
"name": "24.0.0.9-java11",
"name": "24.0.0.11-java11",
"annotations": {
"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.",
"iconClass": "icon-openliberty",
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 11",
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 11",
"openshift.io/provider-display-name": "IBM",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "jee,java",
"tags": "builder,openliberty,java"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java11"
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java11"
},
"generation": null,
"importPolicy": {},
Expand All @@ -56,19 +56,19 @@
}
},
{
"name": "24.0.0.9-java17",
"name": "24.0.0.11-java17",
"annotations": {
"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.",
"iconClass": "icon-openliberty",
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 17",
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 17",
"openshift.io/provider-display-name": "IBM",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "jee,java",
"tags": "builder,openliberty,java"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java17"
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java17"
},
"generation": null,
"importPolicy": {},
Expand All @@ -77,19 +77,19 @@
}
},
{
"name": "24.0.0.9-java21",
"name": "24.0.0.11-java21",
"annotations": {
"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.",
"iconClass": "icon-openliberty",
"openshift.io/display-name": "Open Liberty 24.0.0.9 with Java 21",
"openshift.io/display-name": "Open Liberty 24.0.0.11 with Java 21",
"openshift.io/provider-display-name": "IBM",
"sampleRepo": "https://github.com/openshift/openshift-jee-sample.git",
"supports": "jee,java",
"tags": "builder,openliberty,java"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.9-java21"
"name": "docker.io/openliberty/open-liberty-s2i:24.0.0.11-java21"
},
"generation": null,
"importPolicy": {},
Expand Down
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"openshift\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -663,4 +663,4 @@
"app": "rails-pgsql-persistent",
"template": "rails-pgsql-persistent"
}
}
}
22 changes: 9 additions & 13 deletions assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,6 @@
}
},
"strategy": {
"recreateParams": {
"pre": {
"execNewPod": {
"command": [
"./migrate-database.sh"
],
"containerName": "${NAME}"
},
"failurePolicy": "Abort"
}
},
"type": "Recreate"
},
"template": {
Expand Down Expand Up @@ -391,7 +380,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\", \"namespace\": \"openshift\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -520,6 +509,13 @@
"value": "3.1-ubi8",
"required": true
},
{
"name": "POSTGRESQL_VERSION",
"displayName": "Postgresql Version",
"description": "Version of Postgresql image to be used (12-el8 by default).",
"value": "12-el8",
"required": true
},
{
"name": "MEMORY_LIMIT",
"displayName": "Memory Limit",
Expand Down Expand Up @@ -635,4 +631,4 @@
"app": "rails-postgresql-example",
"template": "rails-postgresql-example"
}
}
}