diff --git a/charts/feast/charts/redis-6.0.0.tgz b/charts/feast/charts/redis-6.0.0.tgz new file mode 100644 index 00000000000..37242fa7429 Binary files /dev/null and b/charts/feast/charts/redis-6.0.0.tgz differ diff --git a/charts/feast/requirements.lock b/charts/feast/requirements.lock index 9d532d9d059..33135de5133 100644 --- a/charts/feast/requirements.lock +++ b/charts/feast/requirements.lock @@ -2,5 +2,8 @@ dependencies: - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com version: 0.19.0 -digest: sha256:1bb5f2d0e2d39c87144d257c9d862e7f9686f0603fdfd4d145d0af38beda0903 -generated: 2018-10-10T15:48:27.20614361+08:00 +- name: redis + repository: https://kubernetes-charts.storage.googleapis.com + version: 6.0.0 +digest: sha256:cb4801425432b544a54462d657daf5ffb8bc18eb5f25b39ef5560a66ae4975eb +generated: 2019-02-07T10:54:57.715495851+08:00 diff --git a/charts/feast/requirements.yaml b/charts/feast/requirements.yaml index 18201996db0..d62c5f73f6f 100644 --- a/charts/feast/requirements.yaml +++ b/charts/feast/requirements.yaml @@ -2,4 +2,8 @@ dependencies: - name: postgresql version: ^0.19.0 repository: "@stable" - condition: provisionDataStore.postgres \ No newline at end of file + condition: postgres.provision + - name: redis + version: ^6.0.0 + repository: "@stable" + condition: redis.provision \ No newline at end of file diff --git a/charts/feast/templates/_helpers.tpl b/charts/feast/templates/_helpers.tpl index ad1f1f39f47..a4ef10cdb10 100644 --- a/charts/feast/templates/_helpers.tpl +++ b/charts/feast/templates/_helpers.tpl @@ -65,7 +65,7 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{/* -Generate postgres secret name +Generate postgresql secret name */}} {{- define "postgresql.secretName" -}} {{ default (include "postgresql.fullname" .) .Values.existingSecret }} diff --git a/charts/feast/templates/core-deploy.yaml b/charts/feast/templates/core-deploy.yaml index bbece68a284..1f5c8c315fd 100644 --- a/charts/feast/templates/core-deploy.yaml +++ b/charts/feast/templates/core-deploy.yaml @@ -75,6 +75,8 @@ spec: secretKeyRef: name: {{ template "postgresql.fullname" . }} key: postgres-password + - name: LOG_TYPE + value: {{ .Values.core.logType }} - name: PROJECT_ID value: "{{ .Values.core.projectId}}" - name: TRAINING_DATASET_PREFIX @@ -90,7 +92,7 @@ spec: - name: JOB_MONITOR_INITIAL_DELAY_MS value: "{{ .Values.core.jobs.monitoring.initialDelay }}" - name: JOB_ERRORS_STORE_TYPE - value: {{ .Values.core.jobs.errorsStoreType }} + value: {{ .Values.core.jobs.errorStoreType }} - name: JOB_ERRORS_STORE_OPTIONS value: {{ .Values.core.jobs.errorStoreOptions | toJson}} - name: STATSD_HOST diff --git a/charts/feast/values.yaml b/charts/feast/values.yaml index f8e67f26cc1..ac49033c939 100644 --- a/charts/feast/values.yaml +++ b/charts/feast/values.yaml @@ -3,9 +3,9 @@ core: projectId: "gcp-project-id" image: pullPolicy: IfNotPresent - registry: feast + registry: gcr.io/kf-feast repository: feast-core - tag: "0.1.0" + tag: "1234" replicaCount: 3 resources: limits: @@ -27,19 +27,23 @@ core: jobs: runner: DirectRunner options: "{}" - errorsStoreType: "stdout" + errorStoreType: "stdout" errorStoreOptions: "{}" monitoring: period: 5000 initialDelay: 60000 trainingDatasetPrefix: "fs" + # logType: JSON postgresql: - name: feast-metadata + provision: true + imageTag: 9.6.11 service: port: 5432 -provisionDataStore: - postgres: true + +redis: + name: feast-redis + provision: true serving: config: @@ -51,9 +55,9 @@ serving: timeout: 5 image: pullPolicy: IfNotPresent - registry: feast + registry: gcr.io/kf-feast repository: feast-serving - tag: "0.1.0" + tag: "1234" replicaCount: 4 resources: limits: