diff options
Diffstat (limited to 'kubernetes/policy')
5 files changed, 38 insertions, 18 deletions
diff --git a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml index cd715e4606..e0969022f6 100644 --- a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml +++ b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml @@ -71,8 +71,12 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /tmp/policy-install/config + - mountPath: /tmp/policy-install/config/brmsgw-tweaks.sh name: pe-brmsgw + subPath: brmsgw-tweaks.sh + - mountPath: /tmp/policy-install/config/brmsgw.conf + name: pe-brmsgw + subPath: brmsgw.conf - mountPath: /tmp/policy-install/config/base.conf name: pe subPath: base.conf diff --git a/kubernetes/policy/charts/mariadb/templates/deployment.yaml b/kubernetes/policy/charts/mariadb/templates/deployment.yaml index 65eb02cd6e..1709af7df2 100644 --- a/kubernetes/policy/charts/mariadb/templates/deployment.yaml +++ b/kubernetes/policy/charts/mariadb/templates/deployment.yaml @@ -39,6 +39,8 @@ spec: # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} + args: + - --lower-case-table-names=1 livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} diff --git a/kubernetes/policy/charts/pdp/templates/statefulset.yaml b/kubernetes/policy/charts/pdp/templates/statefulset.yaml index 367cde49bd..d09c446381 100644 --- a/kubernetes/policy/charts/pdp/templates/statefulset.yaml +++ b/kubernetes/policy/charts/pdp/templates/statefulset.yaml @@ -78,8 +78,15 @@ spec: - mountPath: /tmp/policy-install/config/base.conf name: pe subPath: base.conf - - mountPath: /tmp/policy-install/config/ + - mountPath: /tmp/policy-install/config/pdp-tweaks.sh name: pe-pdp + subPath: pdp-tweaks.sh + - mountPath: /tmp/policy-install/config/pdplp.conf + name: pe-pdp + subPath: pdplp.conf + - mountPath: /tmp/policy-install/config/pdp.conf + name: pe-pdp + subPath: pdp.conf - mountPath: /tmp/policy-install/do-start.sh name: pe-scripts subPath: do-start.sh diff --git a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf index c335d4acab..4549406f76 100644 --- a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf +++ b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf @@ -14,7 +14,8 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 POLICY_HOME=/opt/app/policy -KEYSTORE_PASSWD=PolicyR0ck$ +POLICY_LOGS=/var/log/onap +KEYSTORE_PASSWD=Pol1cy_0nap JDBC_DRIVER=org.mariadb.jdbc.Driver JDBC_URL=jdbc:mariadb://{{ .Release.Name }}-{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/onap_sdk?failOverReadOnly=false&autoReconnect=true diff --git a/kubernetes/policy/templates/deployment.yaml b/kubernetes/policy/templates/deployment.yaml index 88b3de35c0..8dca8ab34f 100644 --- a/kubernetes/policy/templates/deployment.yaml +++ b/kubernetes/policy/templates/deployment.yaml @@ -45,19 +45,6 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - - command: ["/bin/bash", "-c", "echo $POD_IP > /config/ip_addr.txt"] - env: - - name: POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - volumeMounts: - - mountPath: /config/ - name: pe - image: {{ .Values.global.ubuntuImage }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: generate-ip-addr-txt containers: - command: - /bin/bash @@ -88,11 +75,30 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - mountPath: /tmp/policy-install/config/push-policies.sh + name: pe-pap + subPath: push-policies.sh + - mountPath: /tmp/policy-install/config/pap-tweaks.sh + name: pe-pap + subPath: pap-tweaks.sh + - mountPath: /tmp/policy-install/config/paplp.conf + name: pe-pap + subPath: paplp.conf + - mountPath: /tmp/policy-install/config/pap.conf + name: pe-pap + subPath: pap.conf + - mountPath: /tmp/policy-install/config/mysql.conf + name: pe-pap + subPath: mysql.conf + - mountPath: /tmp/policy-install/config/elk.conf + name: pe-pap + subPath: elk.conf + - mountPath: /tmp/policy-install/config/console.conf + name: pe-pap + subPath: console.conf - mountPath: /tmp/policy-install/config/base.conf name: pe subPath: base.conf - - mountPath: /tmp/policy-install/config/ - name: pe-pap - mountPath: /tmp/policy-install/do-start.sh name: pe-scripts subPath: do-start.sh |