diff options
| author |   jmac <james.macnider@amdocs.com> | 2018-10-12 18:24:24 +0000 |
|---|---|---|
| committer | jmac <james.macnider@amdocs.com> | 2018-10-12 19:19:11 +0000 |
| commit | c4f04d379ab427475ec792d9758ae2c02aae1e00 (patch) | |
| tree | f9969f64792753d2b4d3fe00ef026c0111c618f1 /kubernetes/so/charts/so-monitoring | |
| parent | c57267b3f3fc1f986000e483563b62481cea5d96 (diff) | |
Added missing maria db dependencies
If there are other inter-pod dependencies that should be
managed, please comment to let me know so they can be added.
Also addressed the missing globals section in the pods values.yaml
files and incorrect pull policy management to make them follow
the standard conventions
Change-Id: I3625f8452d90182391e1ff4af5fddfe9d0948a32
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-1472
Diffstat (limited to 'kubernetes/so/charts/so-monitoring')
| -rw-r--r-- | kubernetes/so/charts/so-monitoring/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/so/charts/so-monitoring/values.yaml | 19 |
2 files changed, 20 insertions, 3 deletions
diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml index e11e404e8d..bfedc05a19 100644 --- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml @@ -45,7 +45,7 @@ spec: volumeMounts: - name: logs mountPath: /app/logs - imagePullPolicy: {{ index .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /app/logs"] restartPolicy: Always containers: @@ -87,7 +87,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs diff --git a/kubernetes/so/charts/so-monitoring/values.yaml b/kubernetes/so/charts/so-monitoring/values.yaml index 79170eb5d2..a0915a1223 100644 --- a/kubernetes/so/charts/so-monitoring/values.yaml +++ b/kubernetes/so/charts/so-monitoring/values.yaml @@ -16,8 +16,25 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # @author: gareth.roper@ericsson.com +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/so-monitoring:latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 9091 |