Merge "[SDNC] Set STDOUT Log level"

[oom.git] / kubernetes / multicloud / charts / multicloud-prometheus / templates / deployment.yaml

diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
index 00c6e21..cb76bac 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
@@ -14,7 +14,9 @@
 # limitations under the License.
 */}}
 
-apiVersion: extensions/v1beta1
+{{- if .Values.global.prometheus.enabled -}}
+
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -22,7 +24,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -33,7 +35,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
@@ -119,3 +121,5 @@ spec:
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
       restartPolicy: Always
+
+{{- end -}}