From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Tue, 29 Oct 2019 14:56:11 +0000 (+0000)
Subject: Merge "AAF cert dist for DMaaP DR"
X-Git-Tag: 6.0.0~555
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e3806913b0551c6bc5d5d66538f6bb59cd33fd2a;hp=-c;p=oom.git

Merge "AAF cert dist for DMaaP DR"
---

e3806913b0551c6bc5d5d66538f6bb59cd33fd2a
diff --combined kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index f6d67214a6,671b42ff9b..21524ef30c
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@@ -60,17 -60,15 +60,17 @@@ spec
                port: {{ .Values.service.externalPort }}
              initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
              periodSeconds: {{ .Values.liveness.periodSeconds }}
 +            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
            {{ end -}}
            readinessProbe:
              tcpSocket:
                port: {{ .Values.service.externalPort }}
              initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
              periodSeconds: {{ .Values.readiness.periodSeconds }}
 +            timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
            env:
            - name: enableCadi
-             value: "true"
+             value: "{{ .Values.global.aafEnabled }}"
            volumeMounts:
            - mountPath: /etc/localtime
              name: localtime
@@@ -88,7 -86,7 +88,7 @@@
              subPath: mykey
              name: mykey
            resources:
- {{ include "common.resources" . | indent 12 }}
+ {{ include "common.resources" . }}
        volumes:
          - name: localtime
            hostPath: