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/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 3bddb1e..2b88f3f 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.7.1"
+version: "2.7.2"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
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 }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index de7ab4d..54dbca6 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -18,7 +18,8 @@
fullNameOverride: ~
# Default overrides
-defaults:
+global:
+ stack_name: voltha
log_level: "WARN"
image_registry: ""
image_tag: ~
@@ -31,14 +32,12 @@
# kv store timeout
adapter_open_onu:
timeout: "5s"
- topics:
- core_topic: "rwcore"
- adapter_open_onu_topic: "brcm_openomci_onu"
-
- # Define prefix path for etcd
- # If you're running multiple voltha stacks the this value
- # should be unique across the stacks.
- kv_store_data_prefix: "service/voltha"
+ # Configure Log Correlation
+ log_correlation:
+ enabled: true
+ # Configure Tracing
+ tracing:
+ enabled: true
# Default security context under which the containers run
securityContext:
@@ -62,24 +61,32 @@
service: etcd
port: 2379
+ # Define Tracing Agent connection details
+ tracing_agent:
+ address: jaeger-agent:6831
+
# Define the recplica count for everything
replicas:
adapter_open_onu: 1
adapter_open_onu:
- log_level: '{{ .Values.defaults.log_level }}'
- incremental_evto_update: '{{ .Values.defaults.incremental_evto_update }}'
- max_timeout_interadapter_comm: '{{ .Values.defaults.max_timeout_interadapter_comm }}'
- kv_store_timeout: '{{ .Values.defaults.adapter_open_onu.timeout }}'
+ log_level: '{{ .Values.global.log_level }}'
+ incremental_evto_update: '{{ .Values.global.incremental_evto_update }}'
+ max_timeout_interadapter_comm: '{{ .Values.global.max_timeout_interadapter_comm }}'
+ kv_store_timeout: '{{ .Values.global.adapter_open_onu.timeout }}'
+ kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
+ topics:
+ core_topic: "{{ .Values.global.stack_name }}_rwcore"
+ adapter_open_onu_topic: "{{ .Values.global.stack_name }}_brcm_openomci_onu"
images:
adapter_open_onu:
- registry: '{{ .Values.defaults.image_registry }}'
- repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter'
- tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.5.0{{- end }}{{- else }}2.5.0{{- end }}'
- pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
+ registry: '{{ .Values.global.image_registry }}'
+ repository: '{{ .Values.global.image_org }}voltha-openonu-adapter'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.5.0{{- end }}{{- else }}2.5.0{{- end }}'
+ pullPolicy: '{{ .Values.global.image_pullPolicy }}'
adapter_open_onu_go:
- registry: '{{ .Values.defaults.image_registry }}'
- repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter-go'
- tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}0.1.15{{- end }}{{- else }}0.1.15{{- end }}'
- pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
+ registry: '{{ .Values.global.image_registry }}'
+ repository: '{{ .Values.global.image_org }}voltha-openonu-adapter-go'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}0.1.15{{- end }}{{- else }}0.1.15{{- end }}'
+ pullPolicy: '{{ .Values.global.image_pullPolicy }}'