summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts/so-monitoring
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-10-15 12:20:24 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-15 12:20:24 +0000
commit42cb9f11d8ef4756d9d51aca4c3bb08277b86869 (patch)
tree76a763622088c6b00c827a4856a1a8dc86c67683 /kubernetes/so/charts/so-monitoring
parentd5d5d1387f692610255e602ea18360d61626e614 (diff)
parentc4f04d379ab427475ec792d9758ae2c02aae1e00 (diff)
Merge "Added missing maria db dependencies"
Diffstat (limited to 'kubernetes/so/charts/so-monitoring')
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/deployment.yaml4
-rw-r--r--kubernetes/so/charts/so-monitoring/values.yaml19
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