VOL-3657 support stack id in rpc events by passing stack id through helm chart
Change-Id: Id45c5984540265eb40df77de979f732080908656
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 27f9143..987c363 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,12 +28,12 @@
name: voltha-stack
appVersion: "2.8-dev"
-version: 0.2.0
+version: 0.2.1
dependencies:
- name: voltha
repository: file://../voltha
- version: 2.9.0
+ version: 2.9.1
condition: voltha.enabled
- name: voltha-adapter-openonu
repository: file://../voltha-adapter-openonu
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index dea3bad..74015e1 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -30,6 +30,7 @@
enableVirtualHosts: false
rw_core:
kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
+ stack_id: "{{ .Values.global.stack_name }}"
topics:
core_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_rwcore"
services:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 7a7e54f..c293685 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.9.0"
+version: "2.9.1"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
@@ -33,4 +33,4 @@
# app version applies to multiple components with potentially different
# container image versions
-appVersion: "2.7-dev"
+appVersion: "2.8-dev"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index f10d8b9..ba729f5 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -101,6 +101,7 @@
- "--trace_enabled={{ .Values.global.tracing.enabled }}"
- "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
- "--log_correlation_enabled={{ .Values.global.log_correlation.enabled }}"
+ - "--stack_id={{ tpl .Values.rw_core.stack_id . }}"
ports:
- containerPort: 50057
name: grpc
diff --git a/voltha/values.yaml b/voltha/values.yaml
index e7e5879..6fa6fcc 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -80,6 +80,7 @@
timeout_long_request: '{{ .Values.global.rw_core.timeout }}'
timeout_request: '{{ .Values.global.rw_core.timeout }}'
kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
+ stack_id: "{{ .Values.global.stack_name }}"
topics:
core_topic: "{{ .Values.global.stack_name }}_rwcore"
@@ -97,7 +98,7 @@
rw_core:
registry: '{{ .Values.global.image_registry }}'
repository: '{{ .Values.global.image_org }}voltha-rw-core'
- tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.7.0{{- end }}{{- else }}2.7.0{{- end }}'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.8.1{{- end }}{{- else }}2.8.1{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'
ingress: