Remove default value redis and bigtable storage config (#196)

* Remove default value redis and bigtable storage config * Only set storage env variable is the value is set * Fix typo on the helm template Co-authored-by: Tio Pramayudi <[email protected]>
caraml-dev · Nov 19, 2021 · 8455901 · 8455901
1 parent ec47315
commit 8455901
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/charts/merlin/templates/merlin-deployment.yaml b/charts/merlin/templates/merlin-deployment.yaml
@@ -157,10 +157,14 @@ spec:
             value: "{{ .Values.merlin.transformer.feast.defaultServingURL }}"
           - name: FEAST_SERVING_URLS
             value: {{ .Values.merlin.transformer.feast.servingURLs | toJson | quote }}
+          {{- if .Values.merlin.transformer.feast.redisStorage }}
           - name: FEAST_REDIS_CONFIG
             value: {{ .Values.merlin.transformer.feast.redisStorage | toJson | quote }}
+          {{- end }}
+          {{- if .Values.merlin.transformer.feast.bigtableStorage }}
           - name: FEAST_BIG_TABLE_CONFIG
             value: {{ .Values.merlin.transformer.feast.bigtableStorage | toJson | quote }}
+          {{- end }}
           - name: DEFAULT_FEAST_SOURCE
             value: {{ .Values.merlin.transformer.feast.defaultFeastSource}}
           - name: FEAST_CORE_URL

diff --git a/charts/merlin/values.yaml b/charts/merlin/values.yaml
@@ -119,17 +119,23 @@ merlin:
             icon: "bigtable",
           },
         ]
-      redisStorage:
-        serving_url: "online-serving-redis.feast.dev"
-        redis_addresses: 
-          - 10.1.1.2
-          - 10.1.1.3
-        pool_size: 5
-        max_retries: 0
-        read_timeout: "1s"
-        write_timeout: "1s"
-      bigtableStorage:
-        serving_url: "online-serving-bigtable.feast.dev"
+      ## Redis storage configuration for feast retrieval
+      ##
+      # redisStorage:
+      #   serving_url: "online-serving-redis.feast.dev"
+      #   redis_addresses: 
+      #     - 10.1.1.2
+      #     - 10.1.1.3
+      #   pool_size: 5
+      #   max_retries: 0
+      #   read_timeout: "1s"
+      #   write_timeout: "1s"
+
+      ## Bigtable storage configuration for feast retrieval
+      ##
+      # bigtableStorage:
+      #   serving_url: "online-serving-bigtable.feast.dev"
+
       defaultFeastSource: BIGTABLE
       coreURL: core.feast.dev
       coreAuthAudience: core.feast.dev