diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-09-04 15:44:33 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-09-05 10:08:35 -0400 |
| commit | 128c0ad9e909288898ccb9da9af5cb9b9c1c958e (patch) | |
| tree | f9d5c95c2c053fecb0c4892c960063607c92c8b2 /kubernetes/dcaegen2/charts/dcae-config-binding-service/templates | |
| parent | bbc4c7bbbff54a22916e4a5e040c38a750cb19bb (diff) | |
Add DCAE cleanup job, update CBS version
Also fix CBS and policy handler filebeat loggging.
Shorten names in CBS to remain < 64 with 10-char
release name.
Issue-ID: DCAEGEN2-1729
Issue-ID: DCAEGEN2-1317
Issue-ID: DCAEGEN2-1747
Issue-ID: DCAEGEN2-1749
Issue-ID: DCAEGEN2-1750
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I5a727e3c9502205bc727439ed70728238d59d74e
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-config-binding-service/templates')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml index 5496aee2cb..c3e63fb968 100644 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml @@ -104,25 +104,17 @@ spec: value: "/opt/tls/cert.pem" - name: HTTPS_KEY_PATH value: "/opt/tls/key.pem" - - name: TRUST_STORE_PATH - value: "/opt/app/prh/etc/cert/trust.jks" - - name: TRUST_STORE_PASS_PATH - value: "/opt/app/prh/etc/cert/trust.pass" - - name: KEY_STORE_PATH - value: "/opt/app/prh/etc/cert/key.p12" - - name: KEY_STORE_PASS_PATH - value: "/opt/app/prh/etc/cert/key.pass" - - name: {{ include "common.name" . }}-filebeat-onap + - name: {{ include "common.name" . }}-fb-onap image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - - name: {{ include "common.fullname" . }}-filebeat-conf + - name: {{ include "common.fullname" . }}-fb-conf mountPath: /usr/share/filebeat/filebeat.yml subPath: filebeat.yml - - name: {{ include "common.fullname" . }}-data-filebeat + - name: {{ include "common.fullname" . }}-data-fb mountPath: /usr/share/filebeat/data - name: {{ include "common.fullname" . }}-logs - mountPath: /var/log/onap + mountPath: /var/log/onap/config-binding-service {{ end }} {{- if .Values.service.insecure.enabled }} - name: {{ include "common.name" . }}-insecure @@ -149,29 +141,29 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} volumeMounts: - - name: {{ include "common.fullname" . }}-logs-insecure + - name: {{ include "common.fullname" . }}-logs-i mountPath: /opt/logs env: - name: CONSUL_HOST value: consul.{{ include "common.namespace" . }} - - name: {{ include "common.name" . }}-filebeat-onap-insecure + - name: {{ include "common.name" . }}-fb-onap-i image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - - name: {{ include "common.fullname" . }}-filebeat-conf + - name: {{ include "common.fullname" . }}-fb-conf mountPath: /usr/share/filebeat/filebeat.yml subPath: filebeat.yml - - name: {{ include "common.fullname" . }}-data-filebeat-insecure + - name: {{ include "common.fullname" . }}-data-fb-i mountPath: /usr/share/filebeat/data - - name: {{ include "common.fullname" . }}-logs-insecure - mountPath: /var/log/onap + - name: {{ include "common.fullname" . }}-logs-i + mountPath: /var/log/onap/config-binding-service {{ end }} volumes: - - name: {{ include "common.fullname" . }}-filebeat-conf + - name: {{ include "common.fullname" . }}-fb-conf configMap: name: {{ .Release.Name }}-cbs-filebeat-configmap {{- if .Values.service.secure.enabled }} - - name: {{ include "common.fullname" . }}-data-filebeat + - name: {{ include "common.fullname" . }}-data-fb emptyDir: {} - name: {{ include "common.fullname" . }}-logs emptyDir: {} @@ -179,9 +171,9 @@ spec: emptyDir: {} {{ end }} {{- if .Values.service.insecure.enabled }} - - name: {{ include "common.fullname" . }}-data-filebeat-insecure + - name: {{ include "common.fullname" . }}-data-fb-i emptyDir: {} - - name: {{ include "common.fullname" . }}-logs-insecure + - name: {{ include "common.fullname" . }}-logs-i emptyDir: {} {{ end }} |