Multistack support for ofagent
Change-Id: Id73f3312b6cfb1a7b8a57af3a9269bb2402b2905
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 7c9f11f..bec1af6 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.10.0"
+version: "2.10.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.9-dev"
+appVersion: "2.9.0-dev"
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index 2e399d3..e8c3443 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -17,7 +17,7 @@
{{- end -}}
{{/* Create a default fully qualified app name. We truncate at 63 chars because . . . */}}
{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $name := default .Values.global.stack_name .Values.nameOverride -}}
{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullNameOverride -}}
{{- $fullname | trunc 63 | trimSuffix "-" -}}
{{- end -}}
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 93286ff..dfa14ce 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -86,8 +86,6 @@
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
- - name: KV_STORE_DATAPATH_PREFIX
- value: {{ .Values.global.kv_store_data_prefix }}
args:
- "/app/ofagent"
{{- range $controllers.controllers }}