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
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index c04c5f6..84bb42b 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -48,6 +48,7 @@
app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
app.kubernetes.io/component: "adapter"
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" }}
@@ -77,24 +78,26 @@
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
- name: KV_STORE_DATAPATH_PREFIX
- value: {{ .Values.defaults.kv_store_data_prefix }}
+ value: {{ tpl .Values.adapter_open_onu.kv_store_data_prefix . }}
args:
- "/app/openonu"
- "--banner=true"
- "--kafka_reconnect_retries=-1"
- - "--kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
+ - "--kafka_adapter_host={{ tpl .Values.services.kafka.adapter.service . }}"
- "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
- - "--kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
+ - "--kafka_cluster_host={{ tpl .Values.services.kafka.cluster.service . }}"
- "--kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
- - "--core_topic={{ .Values.defaults.topics.core_topic }}"
- - "--adapter_topic={{ .Values.defaults.topics.adapter_open_onu_topic }}"
- - "--kv_store_host={{ .Values.services.etcd.service }}"
+ - "--core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}"
+ - "--adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}"
+ - "--kv_store_host={{ tpl .Values.services.etcd.service . }}"
- "--kv_store_port={{ .Values.services.etcd.port }}"
- "--kv_store_request_timeout={{ tpl .Values.adapter_open_onu.kv_store_timeout . }}"
- "--log_level={{ $log_level }}"
- "--probe_port=8080"
- "--accept_incr_evto={{ tpl .Values.adapter_open_onu.incremental_evto_update . }}"
- "--max_timeout_interadapter_comm={{ tpl .Values.adapter_open_onu.max_timeout_interadapter_comm . }}"
+ - "--trace_enabled={{ .Values.global.tracing.enabled }}"
+ - "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
{{- if .Values.securityContext.enabled }}
securityContext:
allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml b/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml
index 15517b2..3a96220 100644
--- a/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml
+++ b/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml
@@ -49,6 +49,7 @@
app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
app.kubernetes.io/component: "adapter"
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" }}
@@ -75,13 +76,13 @@
command: [ "sh", "-c"]
args:
- "REPLICA_ID=$(echo $VOLTHA_POD_NAME | grep -o '.$') && REPLICA_ID=$((REPLICA_ID + 1)) && echo $REPLICA_ID && python /voltha/adapters/brcm_openomci_onu/main.py
- --kafka_adapter={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}
- --kafka_cluster={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}
- --core_topic={{ .Values.defaults.topics.core_topic }}
- --adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}
- --name={{ .Values.defaults.topics.adapter_open_onu_topic }}
+ --kafka_adapter={{ tpl .Values.services.kafka.adapter.service . }}:{{ .Values.services.kafka.adapter.port }}
+ --kafka_cluster={{ tpl .Values.services.kafka.cluster.service . }}:{{ .Values.services.kafka.cluster.port }}
+ --core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}
+ --adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_olt_topic . }}
+ --name={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}
--backend=etcd
- --etcd={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}
+ --etcd={{ tpl .Values.services.etcd.service . }}:{{ .Values.services.etcd.port }}
--probe=:8080
--log_level={{ tpl .Values.adapter_open_onu.log_level . | upper }}
--totalReplicas={{ .Values.replicas.adapter_open_onu }}
@@ -113,5 +114,5 @@
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
- name: KV_STORE_DATAPATH_PREFIX
- value: {{ .Values.defaults.kv_store_data_prefix }}
+ value: {{ tpl .Values.adapter_open_onu.kv_store_data_prefix . }}
{{- end }}