Extract config in configmaps.

Financial-Times · Feb 16, 2018 · 4a602ea · 4a602ea
1 parent c2e0363
commit 4a602ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/helm/splunk-event-reader/templates/deployment.yaml b/helm/splunk-event-reader/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
         - name: APP_PORT
-          value: "{{ .Values.env.APP_PORT }}"
+          value: "8080"
         - name: ENVIRONMENT
           valueFrom:
             configMapKeyRef:
@@ -44,6 +44,11 @@ spec:
             configMapKeyRef:
               name: global-config
               key: splunk.index
+        - name: SPLUNK_URL
+          valueFrom:
+            configMapKeyRef:
+              name: global-config
+              key: splunk.url
         - name: SPLUNK_USER
           valueFrom: 
             secretKeyRef:
@@ -54,8 +59,6 @@ spec:
             secretKeyRef:
               name: splunk-event-reader
               key: splunk.rest-api.password
-        - name: SPLUNK_URL
-          value: "{{ .Values.env.SPLUNK_URL }}"
         ports: 
         - containerPort: 8080 
         livenessProbe: 

diff --git a/helm/splunk-event-reader/values.yaml b/helm/splunk-event-reader/values.yaml
@@ -12,8 +12,5 @@ resources:
     memory: 300Mi
   limits:
     memory: 550Mi
-env:
-  APP_PORT: "8080"
-  SPLUNK_URL: "https://financialtimes.splunkcloud.com:8089"