commit b4c5f4e64d9bed6eb395da5c460ea1e5d21e77a9
author Matteo Scandolo <matteo.scandolo@gmail.com> Wed Nov 11 12:05:23 2020 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jan 21 18:37:09 2021 -0800
tree 81a882ee79d6a78bc4944565b23c20e374269a44
parent 786b9ca2db0a80a1f193e724482848c821e7ea4b

Added voltha-infra chart
Added voltha-stack chart
Moved "defaults" values to "global" so that they can be managed by the
macro charts
Added examples for different workflows

Change-Id: I5fb2bfa54a1be725892445e93bd8a35d608e5d14

voltha/templates/core-deploy.yaml

diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 1fc648f..f10d8b9 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -47,6 +47,7 @@
         app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
         app.kubernetes.io/component: "core"
         app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/stack: "{{ .Values.global.stack_name }}"
         app.kubernetes.io/managed-by: {{ quote .Release.Service }}
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         {{- if hasKey .Values "extra_pod_labels" }}
@@ -82,24 +83,24 @@
                 fieldRef:
                   fieldPath: metadata.labels['app.kubernetes.io/name']
             - name: KV_STORE_DATAPATH_PREFIX
-              value: {{ .Values.defaults.kv_store_data_prefix }}
+              value: {{ tpl .Values.rw_core.kv_store_data_prefix . }}
           args:
             - "/app/rw_core"
             - "--kv_store_type=etcd"
-            - "--kv_store_address={{ .Values.services.etcd.address }}"
+            - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
             - "--grpc_address=0.0.0.0:50057"
             - "--banner"
-            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.address }}"
-            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.address }}"
-            - "--rw_core_topic={{ .Values.defaults.topics.core_topic }}"
+            - "--kafka_adapter_address={{ tpl .Values.services.kafka.adapter.address . }}"
+            - "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
+            - "--rw_core_topic={{ tpl .Values.rw_core.topics.core_topic . }}"
             - "--core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
             - "--timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
             - "--timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
             - "--log_level={{ $log_level }}"
             - "--probe_address=:8080"
-            - "--trace_enabled={{ .Values.tracing.enabled }}"
-            - "--trace_agent_address={{ .Values.services.tracing_agent.address }}"
-            - "--log_correlation_enabled={{ .Values.log_correlation.enabled }}"
+            - "--trace_enabled={{ .Values.global.tracing.enabled }}"
+            - "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
+            - "--log_correlation_enabled={{ .Values.global.log_correlation.enabled }}"
           ports:
             - containerPort: 50057
               name: grpc