Update charts (#71)

* Add service account with required roles to core deployment * Add filter to eliminate the need to escape json in values file * Add helm package * Add index file * Moved index and package to dist folder * Add additional env vars for error store
feast-dev · Jan 14, 2019 · 3f97a8e · 3f97a8e
1 parent f675650
commit 3f97a8e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/charts/dist/feast-0.3.0.tgz b/charts/dist/feast-0.3.0.tgz
diff --git a/charts/dist/index.yaml b/charts/dist/index.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+entries:
+  feast:
+  - apiVersion: v1
+    appVersion: 0.3.0
+    created: 2019-01-12T19:12:26.9585+08:00
+    description: A Helm chart to install Feast on kubernetes
+    digest: cba907c528b94d8b478a1c21ad75a82576505731a579877b797cdf04b2d1aa2d
+    name: feast
+    urls:
+    - feast-0.3.0.tgz
+    version: 0.3.0
+generated: 2019-01-12T19:12:26.95618+08:00
diff --git a/charts/feast/templates/core-deploy.yaml b/charts/feast/templates/core-deploy.yaml
@@ -57,6 +57,12 @@ spec:
           limits:
             cpu: {{ .Values.core.resources.limits.cpu }}
             memory: {{ .Values.core.resources.limits.memory }}
+        {{- if .Values.serviceAccount }}
+        volumeMounts:
+          - mountPath: "/etc/gcloud/service-accounts"
+            name: "{{ .Values.serviceAccount.name }}"
+            readOnly: false
+        {{- end }}
         env:
           - name: GRPC_PORT
             value: "{{ .Values.core.service.grpc.targetPort }}"
@@ -74,13 +80,15 @@ spec:
           - name: JOB_RUNNER
             value: {{ .Values.core.jobs.runner }}
           - name: JOB_OPTIONS
-            value: {{ .Values.core.jobs.options }}
-          - name: JOB_ERRORS_STORE_ID
-            value: {{ .Values.core.jobs.errorsStoreId }}
+            value: {{ .Values.core.jobs.options | toJson}}
           - name: JOB_MONITOR_PERIOD_MS
             value: "{{ .Values.core.jobs.monitoring.period }}"
           - name: JOB_MONITOR_INITIAL_DELAY_MS
             value: "{{ .Values.core.jobs.monitoring.initialDelay }}"
+          - name: JOB_ERRORS_STORE_TYPE
+            value: {{ .Values.core.jobs.errorsStoreType }}
+          - name: JOB_ERRORS_STORE_OPTIONS
+            value: {{ .Values.core.jobs.errorStoreOptions | toJson}}
           - name: STATSD_HOST
             value: {{ .Values.statsd.host }}
           - name: STATSD_PORT
@@ -91,3 +99,11 @@ spec:
           - name: DATAFLOW_LOCATION
             value: {{ .Values.dataflow.location }}
           {{- end }}
+          {{- if .Values.serviceAccount }}
+          - name: GOOGLE_APPLICATION_CREDENTIALS
+            value: /etc/gcloud/service-accounts/key.json
+      volumes:
+        - name: "{{ .Values.serviceAccount.name }}"
+          secret:
+            secretName: "{{ .Values.serviceAccount.key }}"
+          {{- end }}
diff --git a/charts/feast/values.yaml b/charts/feast/values.yaml
@@ -26,7 +26,8 @@ core:
   jobs: 
     runner: DirectRunner
     options: "{}"
-    errorsStoreId: "STDOUT"
+    errorsStoreType: "STDOUT"
+    errorStoreOptions: "{}"
     monitoring:
       period: 5000
       initialDelay: 60000      
@@ -71,3 +72,11 @@ serving:
       targetPort: 8080
   jaeger:
     enabled: false
+
+serviceAccount:
+  name: feast-service-account
+  key: feast-service-account-key
+
+statsd:
+  host: "localhost"
+  port: 8125