Skip to content

Commit 7ef9065

Browse files
committed
Set default db to postgres.
1 parent 0aef51c commit 7ef9065

File tree

8 files changed

+28
-13
lines changed

8 files changed

+28
-13
lines changed

Bluemix/odm-standard-bx-lite.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: SAMPLE
1717
value: "true"
1818
ports:
19-
- containerPort: 1527
19+
- containerPort: 5432
2020
---
2121
apiVersion: v1
2222
kind: Service
@@ -28,7 +28,7 @@ spec:
2828
type: NodePort
2929
ports:
3030
- protocol: TCP
31-
port: 1527
31+
port: 5432
3232
---
3333
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
3434
kind: Deployment

Bluemix/odm-standard-bx-standard.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: SAMPLE
1717
value: "true"
1818
ports:
19-
- containerPort: 1527
19+
- containerPort: 5432
2020
---
2121
apiVersion: v1
2222
kind: Service
@@ -28,7 +28,7 @@ spec:
2828
type: LoadBalancer
2929
ports:
3030
- protocol: TCP
31-
port: 1527
31+
port: 5432
3232
---
3333
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
3434
kind: Deployment

MiniKube/odm-standard-minikube.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ spec:
4848
- name: SAMPLE
4949
value: "true"
5050
ports:
51-
- containerPort: 1527
51+
- containerPort: 5432
5252
volumeMounts:
5353
- name: odm-volume
5454
# mount path within the container
55-
mountPath: /dbs
55+
mountPath: /pgdata
5656
---
5757
apiVersion: v1
5858
kind: Service
@@ -64,7 +64,7 @@ spec:
6464
type: NodePort
6565
ports:
6666
- protocol: TCP
67-
port: 1527
67+
port: 5432
6868
---
6969
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
7070
kind: Deployment
@@ -98,7 +98,7 @@ spec:
9898
port: 9080
9999
- name: notification
100100
protocol: TCP
101-
port: 1883
101+
port: 1883
102102
---
103103
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
104104
kind: Deployment

gcloud/odm-standard-gcloud.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: SAMPLE
1717
value: "true"
1818
ports:
19-
- containerPort: 1527
19+
- containerPort: 5432
2020
---
2121
apiVersion: v1
2222
kind: Service
@@ -28,7 +28,7 @@ spec:
2828
type: LoadBalancer
2929
ports:
3030
- protocol: TCP
31-
port: 1527
31+
port: 5432
3232
---
3333
apiVersion: extensions/v1beta1 # for versions before 1.6.0 use extensions/v1beta1
3434
kind: Deployment

helm/stable/odmcharts/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ The following tables lists the configurable parameters of the Drupal chart and t
5252
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
5353
| `service.type` | Kubernetes Service type | `NodePort` |
5454
| `persistence.enabled` | Enable persistence using PVC | `false` |
55+
| `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` |
56+
| `persistence.postgresql.password` | This parameter sets the superuser password for PostgreSQL. The default superuser is defined by the 'persistence.postgresql.user' environment variable. | `odm` |
57+
| `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` |
5558
| `decisionServerRuntime.replicaCount`| Number of the desired runtime | `2` |
5659
| `decisionCenter.replicaCount` | Number of the desired Decision Center | `1` |
5760
| `decisionRunner.replicaCount` | Number of the desired Decision Runner | `1` |

helm/stable/odmcharts/templates/dbserver-deployment.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,22 @@ spec:
3636
image: {{ .Values.image.repository }}/dbserver:{{ .Values.image.tag }}
3737
imagePullPolicy: {{ .Values.image.pullPolicy }}
3838
env:
39+
- name: POSTGRES_USER
40+
value: "{{ .Values.persistence.postgresql.user }}"
41+
- name: POSTGRES_PASSWORD
42+
value: "{{ .Values.persistence.postgresql.password }}"
43+
- name: POSTGRES_DB
44+
value: "{{ .Values.persistence.postgresql.databasename }}"
45+
- name: PGDATA
46+
value: "/pgdata"
3947
- name: SAMPLE
4048
value: "{{ .Values.persistence.populateDataSample }}"
4149
ports:
42-
- containerPort: 1527
50+
- containerPort: 5432
4351
{{- if .Values.persistence.enabled }}
4452
volumeMounts:
4553
- name: {{ template "fullname" . }}-volume
46-
mountPath: /dbs
54+
mountPath: /pgdata
4755
{{- end }}
4856
{{- if (not (empty .Values.image.pullSecrets )) }}
4957
imagePullSecrets:

helm/stable/odmcharts/templates/dbserver-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ spec:
2424
type: {{ .Values.service.type }}
2525
ports:
2626
- protocol: TCP
27-
port: 1527
27+
port: 5432

helm/stable/odmcharts/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ image:
1515
persistence:
1616
enabled: true
1717
populateDataSample: false
18+
postgresql:
19+
user: odm
20+
password: odm
21+
databasename: odmdb
1822

1923

2024
service:

0 commit comments

Comments
 (0)