diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-14 13:35:13 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-21 14:07:35 +0100 |
| commit | 4898dc0d5b06479f67277886549dbd64416821a4 (patch) | |
| tree | 6144b5b27b3b3d0d5fbfd3fa16efce4d122ec36f /kubernetes/policy/charts/policy-xacml-pdp | |
| parent | 0b844c9a74e29e2046c96f4635c429eb4dc8d677 (diff) | |
[Policy] Use common mariadb galera chart
Instead of using "own" galera chart, reuse chart placed in common part
of OOM installation.
Will ease move to common galera cluster (which is not done by this
commit).
Change-Id: I2d7c1e5cdc9289cfb55e288b1697373239ef96e3
Issue-ID: POLICY-1467
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/policy/charts/policy-xacml-pdp')
| -rw-r--r-- | kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties | 6 | ||||
| -rw-r--r-- | kubernetes/policy/charts/policy-xacml-pdp/templates/deployment.yaml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties index be9a3faa45..29feeb6e24 100644 --- a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties +++ b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties @@ -48,6 +48,6 @@ xacml.pip.engines=count-recent-operations,get-operation-outcome # JPA Properties # javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -javax.persistence.jdbc.url=jdbc:mariadb://{{ .Values.global.mariadb.nameOverride }}:3306/operationshistory -javax.persistence.jdbc.user=policy_user -javax.persistence.jdbc.password=cG9saWN5X3VzZXI= +javax.persistence.jdbc.url=jdbc:mariadb://{{ .Values.global.mariadb.service.name }}:{{ .Values.global.mariadb.service.internalPort }}/operationshistory +javax.persistence.jdbc.user={{ .Values.global.mariadb.config.userName }} +javax.persistence.jdbc.password={{ .Values.global.mariadb.config.userPassword | b64enc }} diff --git a/kubernetes/policy/charts/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/charts/policy-xacml-pdp/templates/deployment.yaml index da9b0197d3..ced19b9f52 100644 --- a/kubernetes/policy/charts/policy-xacml-pdp/templates/deployment.yaml +++ b/kubernetes/policy/charts/policy-xacml-pdp/templates/deployment.yaml @@ -21,7 +21,7 @@ spec: - /root/ready.py args: - --container-name - - {{ .Values.global.mariadb.nameOverride }} + - {{ .Release.Name }}-galera-config env: - name: NAMESPACE valueFrom: |