|
|
|
@ -120,7 +120,6 @@ spec: |
|
|
|
- name: ARTIFACT_DIR |
|
|
|
value: ${ARTIFACT_DIR} |
|
|
|
- name: MAVEN_ARGS_APPEND |
|
|
|
value: "" |
|
|
|
forcePull: true |
|
|
|
from: |
|
|
|
kind: ImageStreamTag |
|
|
|
@ -233,11 +232,8 @@ spec: |
|
|
|
- name: TX_DATABASE_PREFIX_MAPPING |
|
|
|
value: sso-postgresql=DB |
|
|
|
- name: DB_MIN_POOL_SIZE |
|
|
|
value: "" |
|
|
|
- name: DB_MAX_POOL_SIZE |
|
|
|
value: "" |
|
|
|
- name: DB_TX_ISOLATION |
|
|
|
value: "" |
|
|
|
- name: JGROUPS_PING_PROTOCOL |
|
|
|
value: openshift.DNS_PING |
|
|
|
- name: OPENSHIFT_DNS_PING_SERVICE_NAME |
|
|
|
@ -256,14 +252,15 @@ spec: |
|
|
|
name: demo-seed |
|
|
|
key: sso-admin-password |
|
|
|
- name: SSO_REALM |
|
|
|
value: "" |
|
|
|
- name: SSO_SERVICE_USERNAME |
|
|
|
value: "" |
|
|
|
- name: SSO_SERVICE_PASSWORD |
|
|
|
value: "" |
|
|
|
image: sso |
|
|
|
imagePullPolicy: Always |
|
|
|
livenessProbe: |
|
|
|
failureThreshold: 3 |
|
|
|
periodSeconds: 10 |
|
|
|
successThreshold: 1 |
|
|
|
timeoutSeconds: 1 |
|
|
|
exec: |
|
|
|
command: |
|
|
|
- /bin/bash |
|
|
|
@ -285,6 +282,10 @@ spec: |
|
|
|
name: ping |
|
|
|
protocol: TCP |
|
|
|
readinessProbe: |
|
|
|
failureThreshold: 3 |
|
|
|
periodSeconds: 10 |
|
|
|
successThreshold: 1 |
|
|
|
timeoutSeconds: 1 |
|
|
|
exec: |
|
|
|
command: |
|
|
|
- /bin/bash |
|
|
|
@ -293,6 +294,8 @@ spec: |
|
|
|
resources: |
|
|
|
limits: |
|
|
|
memory: 1Gi |
|
|
|
terminationMessagePath: /dev/termination-log |
|
|
|
terminationMessagePolicy: File |
|
|
|
volumeMounts: |
|
|
|
- mountPath: /etc/x509/https |
|
|
|
name: sso-x509-https-volume |
|
|
|
@ -354,16 +357,14 @@ spec: |
|
|
|
- name: POSTGRESQL_DATABASE |
|
|
|
value: sso |
|
|
|
- name: POSTGRESQL_MAX_CONNECTIONS |
|
|
|
value: "" |
|
|
|
- name: POSTGRESQL_MAX_PREPARED_TRANSACTIONS |
|
|
|
value: "" |
|
|
|
- name: POSTGRESQL_SHARED_BUFFERS |
|
|
|
value: "" |
|
|
|
image: postgresql |
|
|
|
imagePullPolicy: Always |
|
|
|
livenessProbe: |
|
|
|
failureThreshold: 3 |
|
|
|
initialDelaySeconds: 90 |
|
|
|
periodSeconds: 10 |
|
|
|
successThreshold: 1 |
|
|
|
tcpSocket: |
|
|
|
port: 5432 |
|
|
|
@ -381,6 +382,7 @@ spec: |
|
|
|
- PGSSLMODE=require psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE |
|
|
|
-c 'SELECT 1' |
|
|
|
failureThreshold: 3 |
|
|
|
periodSeconds: 10 |
|
|
|
initialDelaySeconds: 90 |
|
|
|
successThreshold: 1 |
|
|
|
timeoutSeconds: 10 |
|
|
|
@ -391,6 +393,9 @@ spec: |
|
|
|
name: postgresql-ssl-volume |
|
|
|
readOnly: true |
|
|
|
terminationGracePeriodSeconds: 60 |
|
|
|
resources: {} |
|
|
|
terminationMessagePath: /dev/termination-log |
|
|
|
terminationMessagePolicy: File |
|
|
|
volumes: |
|
|
|
- name: sso-postgresql-pvol |
|
|
|
persistentVolumeClaim: |
|
|
|
|
