adjust helm

neuro-inc · Jul 4, 2019 · 61f3515 · 61f3515
1 parent a6d844d
commit 61f3515
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/deploy/platformmonitoringapi/templates/platformmonitoring.gke.yml b/deploy/platformmonitoringapi/templates/platformmonitoring.gke.yml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: platformmonitoringapi
 spec:
-  replicas: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_REPLICAS | first | default .Values.NP_MONITORING_REPLICAS._default) }}
+  replicas: {{ .Values.NP_MONITORING_REPLICAS }}
   selector:
     matchLabels:
       service: platformmonitoringapi
@@ -19,15 +19,15 @@ spec:
     spec:
       containers:
       - name: platformmonitoringapi
-        image: {{ printf "%s" (pluck .Values.global.env .Values.IMAGE | first | default .Values.IMAGE._default) }}
+        image: {{ .Values.IMAGE }}
         imagePullPolicy: Always
         resources:
           requests:
-            cpu: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_REQUESTS_CPU | first | default .Values.NP_MONITORING_REQUESTS_CPU._default) }}
-            memory: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_REQUESTS_MEMORY | first | default .Values.NP_MONITORING_REQUESTS_MEMORY._default) }}
+            cpu: {{ .Values.NP_MONITORING_REQUESTS_CPU }}
+            memory: {{ .Values.NP_MONITORING_REQUESTS_MEMORY }}
           limits:
-            cpu: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_LIMITS_CPU | first | default .Values.NP_MONITORING_LIMITS_CPU._default) }}
-            memory: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_LIMITS_MEMORY | first | default .Values.NP_MONITORING_LIMITS_MEMORY._default) }}
+            cpu: {{ .Values.NP_MONITORING_LIMITS_CPU }}
+            memory: {{ .Values.NP_MONITORING_LIMITS_MEMORY }}
         env:
         - name: NP_MONITORING_PLATFORM_API_TOKEN
           valueFrom:
@@ -48,13 +48,17 @@ spec:
         - name: NP_MONITORING_K8S_TOKEN_PATH
           value: /var/run/secrets/kubernetes.io/serviceaccount/token
         - name: NP_MONITORING_PLATFORM_API_URL
-          value: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_PLATFORM_API_URL | first | default .Values.NP_MONITORING_PLATFORM_API_URL._default) }}
+          value: {{ .Values.NP_MONITORING_PLATFORM_API_URL }}
         - name: NP_MONITORING_PLATFORM_AUTH_URL
-          value: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_PLATFORM_AUTH_URL | first | default .Values.NP_MONITORING_PLATFORM_AUTH_URL._default) }}
+          value: {{ .Values.NP_MONITORING_PLATFORM_AUTH_URL }}
         - name: NP_MONITORING_ES_HOSTS
-          value: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_ES_HOSTS | first | default .Values.NP_MONITORING_ES_HOSTS._default) }}
+          value: {{ .Values.NP_MONITORING_ES_HOSTS }}
         - name: NP_MONITORING_K8S_NS
-          value: {{ printf "%s" (pluck .Values.global.env .Values.NP_MONITORING_K8S_NS | first | default .Values.NP_MONITORING_K8S_NS._default) }}
+          value: {{ .Values.NP_MONITORING_K8S_NS }}
+      {{- if .Values.DOCKER_LOGIN_ARTIFACTORY_SECRET_NAME }}
+      imagePullSecrets:
+        - name: {{ .Values.DOCKER_LOGIN_ARTIFACTORY_SECRET_NAME }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service