Fixing issue with gRPC endpoints and multi-stack
Change-Id: Ic63023d9a37c7861611e3c6247ba5bf4e82b2c69
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index be4c336..35c1e9a 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,12 +28,12 @@
name: voltha-stack
appVersion: "2.9-dev"
-version: 2.9.9
+version: 2.9.10
dependencies:
- name: voltha
repository: file://../voltha
- version: 2.10.5
+ version: 2.10.6
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 7f69868..ce0a87e 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -18,7 +18,7 @@
log_level: "WARN"
voltha_infra_name: "voltha-infra"
voltha_infra_namespace: "infra"
- core_endpoint: "{{ .Release.Name }}-{{ .Values.global.stack_name }}-core.{{ .Release.Namespace }}.svc:55558"
+ core_endpoint: "{{ .Release.Name }}-voltha-core.{{ .Release.Namespace }}.svc:55558"
log_correlation:
enabled: true
tracing:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 791e5fc..012b833 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.10.5"
+version: "2.10.6"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index e8c3443..2e399d3 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 .Values.global.stack_name .Values.nameOverride -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullNameOverride -}}
{{- $fullname | trunc 63 | trimSuffix "-" -}}
{{- end -}}