Merge pull request #178 from metlos/fix-rails-postgresql

Fix the openshift templates
sclorg · Sep 24, 2024 · 28f2fe3 · 28f2fe3
2 parents c968771 + 6c29e30
commit 28f2fe3
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 15 deletions.
diff --git a/openshift/templates/rails-postgresql-persistent.json b/openshift/templates/rails-postgresql-persistent.json
@@ -408,7 +408,7 @@
  "annotations": {
  "description": "Defines how to deploy the database",
  "template.alpha.openshift.io/wait-for-ready": "true",
- "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"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\"}]"
  }
  },
  "spec": {

diff --git a/openshift/templates/rails-postgresql.json b/openshift/templates/rails-postgresql.json
@@ -147,23 +147,12 @@
  "annotations": {
  "description": "Defines how to deploy the application server",
  "template.alpha.openshift.io/wait-for-ready": "true",
- "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]"
+ "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"},{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.initContainers[0].image\"}]"
  }
  },
  "spec": {
  "strategy": {
- "type": "Recreate",
- "recreateParams": {
- "pre": {
- "failurePolicy": "Abort",
- "execNewPod": {
- "command": [
- "./migrate-database.sh"
- ],
- "containerName": "${NAME}"
- }
- }
- }
+ "type": "Recreate"
  },
  "replicas": 1,
  "selector": {
@@ -179,6 +168,86 @@
  }
  },
  "spec": {
+ "initContainers": [
+ {
+ "name": "ruby-init-container",
+ "image": " ",
+ "command": [
+ "./migrate-database.sh"
+ ],
+ "env": [
+ {
+ "name": "DATABASE_SERVICE_NAME",
+ "value": "${DATABASE_SERVICE_NAME}"
+ },
+ {
+ "name": "POSTGRESQL_USER",
+ "valueFrom": {
+ "secretKeyRef": {
+ "name": "${NAME}",
+ "key": "database-user"
+ }
+ }
+ },
+ {
+ "name": "POSTGRESQL_PASSWORD",
+ "valueFrom": {
+ "secretKeyRef": {
+ "name": "${NAME}",
+ "key": "database-password"
+ }
+ }
+ },
+ {
+ "name": "SECRET_KEY_BASE",
+ "valueFrom": {
+ "secretKeyRef": {
+ "name": "${NAME}",
+ "key": "keybase"
+ }
+ }
+ },
+ {
+ "name": "POSTGRESQL_DATABASE",
+ "value": "${DATABASE_NAME}"
+ },
+ {
+ "name": "POSTGRESQL_MAX_CONNECTIONS",
+ "value": "${POSTGRESQL_MAX_CONNECTIONS}"
+ },
+ {
+ "name": "POSTGRESQL_SHARED_BUFFERS",
+ "value": "${POSTGRESQL_SHARED_BUFFERS}"
+ },
+ {
+ "name": "APPLICATION_DOMAIN",
+ "value": "${APPLICATION_DOMAIN}"
+ },
+ {
+ "name": "APPLICATION_USER",
+ "valueFrom": {
+ "secretKeyRef": {
+ "name": "${NAME}",
+ "key": "application-user"
+ }
+ }
+ },
+ {
+ "name": "APPLICATION_PASSWORD",
+ "valueFrom": {
+ "secretKeyRef": {
+ "name": "${NAME}",
+ "key": "application-password"
+ }
+ }
+ },
+ {
+ "name": "RAILS_ENV",
+ "value": "${RAILS_ENV}"
+ }
+ ]
+ }
+ ],
  "containers": [
  {
  "name": "${NAME}",
@@ -316,7 +385,7 @@
  "annotations": {
  "description": "Defines how to deploy the database",
  "template.alpha.openshift.io/wait-for-ready": "true",
- "image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:12-el8\"},\"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\"}]"
  }
  },
  "spec": {
@@ -438,6 +507,13 @@
  "required": true,
  "value": "3.1-ubi8"
  },
+ {
+ "name": "POSTGRESQL_VERSION",
+ "displayName": "Postgresql Version",
+ "description": "Version of Postgresql image to be used (12-el8 by default).",
+ "required": true,
+ "value": "12-el8"
+ },
  {
  "name": "MEMORY_LIMIT",
  "displayName": "Memory Limit",