Set default db to postgres.

DecisionsDev · Oct 11, 2017 · 7ef9065 · 7ef9065
1 parent 0aef51c
commit 7ef9065
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 13 deletions.
diff --git a/Bluemix/odm-standard-bx-lite.yaml b/Bluemix/odm-standard-bx-lite.yaml
@@ -16,7 +16,7 @@ spec:
         - name: SAMPLE
           value: "true"
         ports:
-        - containerPort: 1527
+        - containerPort: 5432
 ---
 apiVersion: v1
 kind: Service
@@ -28,7 +28,7 @@ spec:
   type: NodePort
   ports:
    - protocol: TCP
-     port: 1527
+     port: 5432
 ---
 apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
 kind: Deployment

diff --git a/Bluemix/odm-standard-bx-standard.yaml b/Bluemix/odm-standard-bx-standard.yaml
@@ -16,7 +16,7 @@ spec:
         - name: SAMPLE
           value: "true"
         ports:
-        - containerPort: 1527
+        - containerPort: 5432
 ---
 apiVersion: v1
 kind: Service
@@ -28,7 +28,7 @@ spec:
   type: LoadBalancer
   ports:
    - protocol: TCP
-     port: 1527
+     port: 5432
 ---
 apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
 kind: Deployment

diff --git a/MiniKube/odm-standard-minikube.yml b/MiniKube/odm-standard-minikube.yml
@@ -48,11 +48,11 @@ spec:
         - name: SAMPLE
           value: "true"
         ports:
-        - containerPort: 1527
+        - containerPort: 5432
         volumeMounts:
           - name: odm-volume
             # mount path within the container
-            mountPath: /dbs
+            mountPath: /pgdata
 ---
 apiVersion: v1
 kind: Service
@@ -64,7 +64,7 @@ spec:
   type: NodePort
   ports:
    - protocol: TCP
-     port: 1527
+     port: 5432
 ---
 apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
 kind: Deployment
@@ -98,7 +98,7 @@ spec:
      port: 9080
    - name: notification
      protocol: TCP
-     port: 1883     
+     port: 1883
 ---
 apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
 kind: Deployment

diff --git a/gcloud/odm-standard-gcloud.yaml b/gcloud/odm-standard-gcloud.yaml
@@ -16,7 +16,7 @@ spec:
         - name: SAMPLE
           value: "true"
         ports:
-        - containerPort: 1527
+        - containerPort: 5432
 ---
 apiVersion: v1
 kind: Service
@@ -28,7 +28,7 @@ spec:
   type: LoadBalancer
   ports:
    - protocol: TCP
-     port: 1527
+     port: 5432
 ---
 apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
 kind: Deployment

diff --git a/helm/stable/odmcharts/README.md b/helm/stable/odmcharts/README.md
@@ -52,6 +52,9 @@ The following tables lists the configurable parameters of the Drupal chart and t
 | `image.pullPolicy`                | Image pull policy                     | `IfNotPresent`                                            |
 | `service.type`                    | Kubernetes Service type               | `NodePort`                                                |
 | `persistence.enabled`             | Enable persistence using PVC          | `false`                                                   |
+| `persistence.postgresql.user` | This parameter is used in conjunction with 'persistence.postgresql.password' to set a user and its password. This parameter will create the specified user with superuser power and a database with the same name.  | `odm`                                                   |
+| `persistence.postgresql.password` | This parameter sets the superuser password for PostgreSQL. The default superuser is defined by the 'persistence.postgresql.user' environment variable.  | `odm`                                                   |
+| `persistence.postgresql.databasename` | This parameter can be used to define a different name for the default database that is created when the image is first started.   | `odmdb` |
 | `decisionServerRuntime.replicaCount`| Number of the desired runtime       | `2`                                             |
 | `decisionCenter.replicaCount`     | Number of the desired Decision Center | `1`                                                     |
 | `decisionRunner.replicaCount`     | Number of the desired Decision Runner | `1`                      |

diff --git a/helm/stable/odmcharts/templates/dbserver-deployment.yaml b/helm/stable/odmcharts/templates/dbserver-deployment.yaml
@@ -36,14 +36,22 @@ spec:
         image: {{ .Values.image.repository }}/dbserver:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+        - name: POSTGRES_USER
+          value: "{{ .Values.persistence.postgresql.user }}"
+        - name: POSTGRES_PASSWORD
+          value: "{{ .Values.persistence.postgresql.password }}"
+        - name: POSTGRES_DB
+          value:  "{{ .Values.persistence.postgresql.databasename }}"
+        - name: PGDATA
+          value:  "/pgdata"
         - name: SAMPLE
           value: "{{ .Values.persistence.populateDataSample }}"
         ports:
-        - containerPort: 1527
+        - containerPort: 5432
         {{- if .Values.persistence.enabled }}
         volumeMounts:
           - name: {{ template "fullname" . }}-volume
-            mountPath: /dbs
+            mountPath: /pgdata
         {{- end }}
         {{- if (not (empty .Values.image.pullSecrets )) }}
       imagePullSecrets:

diff --git a/helm/stable/odmcharts/templates/dbserver-service.yaml b/helm/stable/odmcharts/templates/dbserver-service.yaml
@@ -24,4 +24,4 @@ spec:
   type: {{ .Values.service.type }}
   ports:
    - protocol: TCP
-     port: 1527
+     port: 5432
diff --git a/helm/stable/odmcharts/values.yaml b/helm/stable/odmcharts/values.yaml
@@ -15,6 +15,10 @@ image:
 persistence:
   enabled: true
   populateDataSample: false
+  postgresql:
+    user: odm
+    password: odm
+    databasename: odmdb
 
 
 service: